From: Katsumi Yamaoka <katsumi@flagship2>
Date: Sat, 5 Jun 2010 11:10:33 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7151^2~37
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=96e1af7620379391da84e95a4b5b919e90c90f04;p=emacs.git

Merge from mainline.
---

96e1af7620379391da84e95a4b5b919e90c90f04